Index: source/simulation2/components/CCmpUnitMotion.cpp
===================================================================
--- source/simulation2/components/CCmpUnitMotion.cpp
+++ source/simulation2/components/CCmpUnitMotion.cpp
@@ -1001,8 +1001,11 @@
 
 bool CCmpUnitMotion::ComputeTargetPosition(CFixedVector2D& out) const
 {
-	if (m_MoveRequest.m_Entity == INVALID_ENTITY)
-		return false;
+	if (m_MoveRequest.m_Type == MoveRequest::POINT)
+	{
+		out = CFixedVector2D(m_MoveRequest.m_Position.X, m_MoveRequest.m_Position.Y);
+		return true;
+	}
 
 	CmpPtr<ICmpPosition> cmpPosition(GetSimContext(), m_MoveRequest.m_Entity);
 	if (!cmpPosition || !cmpPosition->IsInWorld())