diff --git a/Phobos.vcxproj b/Phobos.vcxproj
index 362d3109a7..426b358a22 100644
--- a/Phobos.vcxproj
+++ b/Phobos.vcxproj
@@ -63,6 +63,7 @@
     <ClCompile Include="src\Ext\TEvent\Body.cpp" />
     <ClCompile Include="src\Ext\Trigger\Hooks.cpp" />
     <ClCompile Include="src\Ext\Unit\Hooks.Crushing.cpp" />
+    <ClCompile Include="src\Ext\Unit\Hooks.Harvester.cpp" />
     <ClCompile Include="src\Locomotion\TestLocomotionClass.cpp" />
     <ClCompile Include="src\Misc\Hooks.Gamespeed.cpp" />
     <ClCompile Include="src\Misc\Hooks.Ares.cpp" />
@@ -127,7 +128,6 @@
     <ClCompile Include="src\Ext\Techno\Hooks.ReceiveDamage.cpp" />
     <ClCompile Include="src\Ext\Techno\Hooks.TargetEvaluation.cpp" />
     <ClCompile Include="src\Ext\Techno\Hooks.Transport.cpp" />
-    <ClCompile Include="src\Ext\Techno\Hooks.Harvester.cpp" />
     <ClCompile Include="src\Ext\TerrainType\Body.cpp" />
     <ClCompile Include="src\Ext\TerrainType\Hooks.cpp" />
     <ClCompile Include="src\Ext\TerrainType\Hooks.Passable.cpp" />
diff --git a/YRpp b/YRpp
index e821ba32d4..63591f3115 160000
--- a/YRpp
+++ b/YRpp
@@ -1 +1 @@
-Subproject commit e821ba32d4fdbec43b324647cec0db2228c86ace
+Subproject commit 63591f3115a4041bacdafe1e327a7cfed905aa09
diff --git a/src/Ext/Techno/Hooks.Harvester.cpp b/src/Ext/Unit/Hooks.Harvester.cpp
similarity index 97%
rename from src/Ext/Techno/Hooks.Harvester.cpp
rename to src/Ext/Unit/Hooks.Harvester.cpp
index defb9681ea..0802ed7020 100644
--- a/src/Ext/Techno/Hooks.Harvester.cpp
+++ b/src/Ext/Unit/Hooks.Harvester.cpp
@@ -1,14 +1,11 @@
-#include <AircraftClass.h>
-#include "Body.h"
-#include <ScenarioClass.h>
-#include <TunnelLocomotionClass.h>
+#include "Ext/Techno/Body.h"
+
 #include <Ext/BuildingType/Body.h>
 #include <Ext/House/Body.h>
-#include <Ext/Anim/Body.h>
-#include <Ext/WarheadType/Body.h>
-#include <Ext/WeaponType/Body.h>
 #include <Utilities/EnumFunctions.h>
 
+#pragma region HarvesterQuickUnloader
+
 void __fastcall ArrivingRefineryNearBy(UnitClass* pThis, BuildingClass* pDock)
 {
 	pDock->UpdateRefinerySmokeSystems();
@@ -185,6 +182,8 @@ DEFINE_HOOK(0x73EB2C, UnitClass_MissionHarvest_Status2, 0x6)
 
 	if (pType->Teleporter && (move == MovementZone::AmphibiousCrusher || move == MovementZone::AmphibiousDestroyer))
 		move = MovementZone::Amphibious;
+	else if (move == MovementZone::Subterrannean)
+		move = MovementZone::Fly;
 
 	const auto destLocation = pThis->GetDestination();
 	auto destCell = CellStruct { static_cast<short>(destLocation.X >> 8), static_cast<short>(destLocation.Y >> 8) };
@@ -295,3 +294,5 @@ DEFINE_HOOK(0x441226, BuildingClass_Unlimbo_RecheckRefinery, 0x6)
 
 	return 0;
 }
+
+#pragma endregion