diff --git a/OpenRa.Game/PathFinder.cs b/OpenRa.Game/PathFinder.cs
index 2acb47f6f5..893b2e5c2e 100644
--- a/OpenRa.Game/PathFinder.cs
+++ b/OpenRa.Game/PathFinder.cs
@@ -69,7 +69,8 @@ namespace OpenRa.Game
 
 		Func<int2, bool> AvoidUnitsNear(int2 p, int dist)
 		{
-			return q => 
+			return q =>
+				p != q &&
 				((p - q).LengthSquared < dist * dist) && 
 				(Game.UnitInfluence.GetUnitAt(q) != null);
 		}