diff --git a/OpenRA.Mods.Common/Activities/Move/Move.cs b/OpenRA.Mods.Common/Activities/Move/Move.cs
index 140978eb0f..54a8dee11c 100644
--- a/OpenRA.Mods.Common/Activities/Move/Move.cs
+++ b/OpenRA.Mods.Common/Activities/Move/Move.cs
@@ -341,7 +341,7 @@ namespace OpenRA.Mods.Common.Activities
 		{
 			foreach (var actor in self.World.ActorMap.GetActorsAt(cell))
 			{
-				var move = actor.TraitOrDefault<Mobile>();
+				var move = actor.OccupiesSpace as Mobile;
 				if (move == null || !move.IsTraitEnabled() || !move.IsLeaving())
 					return false;
 			}