diff --git a/OpenRA.Game/Traits/DrawLineToTarget.cs b/OpenRA.Game/Traits/DrawLineToTarget.cs
index 2c72b9489c..a241af6715 100644
--- a/OpenRA.Game/Traits/DrawLineToTarget.cs
+++ b/OpenRA.Game/Traits/DrawLineToTarget.cs
@@ -52,8 +52,6 @@ namespace OpenRA.Traits
 
 		public void RenderAfterWorld(WorldRenderer wr)
 		{
-			//if (self.IsIdle) return;
-
 			var force = Game.GetModifierKeys().HasModifier(Modifiers.Alt);
 			if ((lifetime <= 0 || --lifetime <= 0) && !force)
 				return;
@@ -61,9 +59,7 @@ namespace OpenRA.Traits
 			if (targets == null || targets.Count == 0)
 				return;
 
-			var move = self.TraitOrDefault<IMove>();
-			var origin = (move != null ? self.CenterLocation - new PVecInt(0, move.Altitude) : self.CenterLocation).ToFloat2();
-
+			var from = wr.ScreenPxPosition(self.CenterPosition);
 			var wlr = Game.Renderer.WorldLineRenderer;
 
 			foreach (var target in targets)
@@ -71,9 +67,10 @@ namespace OpenRA.Traits
 				if (!target.IsValid)
 					continue;
 
-				wlr.DrawLine(origin, target.CenterLocation.ToFloat2(), c, c);
-				DrawTargetMarker(wlr, target.CenterLocation.ToFloat2());
-				DrawTargetMarker(wlr, origin);
+				var to = wr.ScreenPxPosition(target.CenterPosition);
+				wlr.DrawLine(from, to, c, c);
+				DrawTargetMarker(wlr, from);
+				DrawTargetMarker(wlr, to);
 			}
 		}