diff --git a/OpenRA.Mods.Common/Traits/Carryall.cs b/OpenRA.Mods.Common/Traits/Carryall.cs
index 49af6b7405..f668865c16 100644
--- a/OpenRA.Mods.Common/Traits/Carryall.cs
+++ b/OpenRA.Mods.Common/Traits/Carryall.cs
@@ -245,12 +245,11 @@ namespace OpenRA.Mods.Common.Traits
 			{
 				if (order.OrderString == "DeliverUnit")
 				{
-					var cell = self.World.Map.Clamp(order.TargetLocation);
-
+					var cell = self.World.Map.Clamp(self.World.Map.CellContaining(order.Target.CenterPosition));
 					if (!aircraftInfo.MoveIntoShroud && !self.Owner.Shroud.IsExplored(cell))
 						return;
 
-					var targetLocation = move.NearestMoveableCell(order.TargetLocation);
+					var targetLocation = move.NearestMoveableCell(cell);
 					self.SetTargetLine(Target.FromCell(self.World, targetLocation), Color.Yellow);
 					self.QueueActivity(order.Queued, new DeliverUnit(self, targetLocation));
 				}