Index: source/simulation2/Simulation2.cpp
===================================================================
--- source/simulation2/Simulation2.cpp
+++ source/simulation2/Simulation2.cpp
@@ -539,10 +539,7 @@
 
 	CmpPtr<ICmpPathfinder> cmpPathfinder(simContext, SYSTEM_ENTITY);
 	if (cmpPathfinder)
-	{
 		cmpPathfinder->FetchAsyncResultsAndSendMessages();
-		cmpPathfinder->UpdateGrid();
-	}
 
 	// Push AI commands onto the queue before we use them
 	CmpPtr<ICmpAIManager> cmpAIManager(simContext, SYSTEM_ENTITY);
@@ -594,7 +591,10 @@
 
 	// Process all remaining moves
 	if (cmpPathfinder)
+	{
+		cmpPathfinder->UpdateGrid();
 		cmpPathfinder->StartProcessingMoves(false);
+	}
 }
 
 void CSimulation2Impl::Interpolate(float simFrameLength, float frameOffset, float realFrameLength)
Index: source/simulation2/components/CCmpPathfinder.cpp
===================================================================
--- source/simulation2/components/CCmpPathfinder.cpp
+++ source/simulation2/components/CCmpPathfinder.cpp
@@ -188,6 +188,7 @@
 		m_TerrainDirty = true;
 		UpdateGrid();
 		break;
+	case MT_Create:
 	case MT_Deserialized:
 		UpdateGrid();
 		// In case we were serialised with requests pending, we need to process them.
Index: source/simulation2/components/CCmpPathfinder_Common.h
===================================================================
--- source/simulation2/components/CCmpPathfinder_Common.h
+++ source/simulation2/components/CCmpPathfinder_Common.h
@@ -88,13 +88,12 @@
 public:
 	static void ClassInit(CComponentManager& componentManager)
 	{
+		componentManager.SubscribeToMessageType(MT_Create);
 		componentManager.SubscribeToMessageType(MT_Deserialized);
-		componentManager.SubscribeToMessageType(MT_Update);
 		componentManager.SubscribeToMessageType(MT_RenderSubmit); // for debug overlays
 		componentManager.SubscribeToMessageType(MT_TerrainChanged);
 		componentManager.SubscribeToMessageType(MT_WaterChanged);
 		componentManager.SubscribeToMessageType(MT_ObstructionMapShapeChanged);
-		componentManager.SubscribeToMessageType(MT_TurnStart);
 	}
 
 	~CCmpPathfinder();