diff --git a/OpenRa.Game/PathFinder.cs b/OpenRa.Game/PathFinder.cs
index 893b2e5c2e..833cae1186 100644
--- a/OpenRa.Game/PathFinder.cs
+++ b/OpenRa.Game/PathFinder.cs
@@ -61,7 +61,7 @@ namespace OpenRa.Game
 				var tilesInRange = Game.FindTilesInCircle(target, range)
 					.Where( t => Game.IsCellBuildable( t, umt ) );
 
-				var path = FindPath( PathSearch.FromPoints( tilesInRange, src, umt, false ));
+				var path = FindPath( PathSearch.FromPoints( tilesInRange, src, umt, false ).WithCustomBlocker(AvoidUnitsNear(src, 4)));
 				path.Reverse();
 				return path;
 			}