diff --git a/OpenRA.Mods.Cnc/Player/PlaceSimpleBeacon.cs b/OpenRA.Mods.Cnc/Player/PlaceSimpleBeacon.cs
index d3699a3e12..904cb48f81 100644
--- a/OpenRA.Mods.Cnc/Player/PlaceSimpleBeacon.cs
+++ b/OpenRA.Mods.Cnc/Player/PlaceSimpleBeacon.cs
@@ -53,7 +53,7 @@ namespace OpenRA.Mods.Cnc.Traits
 			if (order.OrderString != "PlaceBeacon")
 				return;
 
-			var pos = self.World.Map.CenterOfCell(order.TargetLocation);
+			var pos = order.Target.CenterPosition;
 
 			self.World.AddFrameEndTask(w =>
 			{
diff --git a/OpenRA.Mods.Common/Traits/Player/PlaceBeacon.cs b/OpenRA.Mods.Common/Traits/Player/PlaceBeacon.cs
index 14cf33aca4..af4516ab24 100644
--- a/OpenRA.Mods.Common/Traits/Player/PlaceBeacon.cs
+++ b/OpenRA.Mods.Common/Traits/Player/PlaceBeacon.cs
@@ -53,14 +53,13 @@ namespace OpenRA.Mods.Common.Traits
 			if (order.OrderString != "PlaceBeacon")
 				return;
 
-			var pos = self.World.Map.CenterOfCell(order.TargetLocation);
-
 			self.World.AddFrameEndTask(w =>
 			{
 				if (playerBeacon != null)
 					self.World.Remove(playerBeacon);
 
-				playerBeacon = new Beacon(self.Owner, pos, info.Duration, info.Palette, info.IsPlayerPalette, info.BeaconImage, info.ArrowSequence, info.CircleSequence);
+				playerBeacon = new Beacon(self.Owner, order.Target.CenterPosition, info.Duration,
+					info.Palette, info.IsPlayerPalette, info.BeaconImage, info.ArrowSequence, info.CircleSequence);
 
 				self.World.Add(playerBeacon);
 
@@ -75,7 +74,7 @@ namespace OpenRA.Mods.Common.Traits
 
 					playerRadarPing = radarPings.Add(
 						() => self.Owner.IsAlliedWith(self.World.RenderPlayer),
-						pos,
+						order.Target.CenterPosition,
 						self.Owner.Color.RGB,
 						info.Duration);
 				}