diff --git a/OpenRA.Mods.RA/Activities/Rearm.cs b/OpenRA.Mods.RA/Activities/Rearm.cs
index a930e46409..e62abe851b 100644
--- a/OpenRA.Mods.RA/Activities/Rearm.cs
+++ b/OpenRA.Mods.RA/Activities/Rearm.cs
@@ -36,7 +36,7 @@ namespace OpenRA.Mods.RA.Activities
 			{
 				if (!limitedAmmo.GiveAmmo()) return NextActivity;
 
-				var hostBuilding = self.World.FindActorsInBox(self.CenterPosition, self.CenterPosition)
+				var hostBuilding = self.World.ActorMap.GetUnitsAt(self.Location)
 					.FirstOrDefault(a => a.HasTrait<RenderBuilding>());
 
 				if (hostBuilding != null)
diff --git a/OpenRA.Mods.RA/Air/Aircraft.cs b/OpenRA.Mods.RA/Air/Aircraft.cs
index ab88485cc6..a88af7990a 100755
--- a/OpenRA.Mods.RA/Air/Aircraft.cs
+++ b/OpenRA.Mods.RA/Air/Aircraft.cs
@@ -71,7 +71,7 @@ namespace OpenRA.Mods.RA.Air
 			if (self.CenterPosition.Z != 0)
 				return null;	// not on the ground.
 
-			return self.World.FindActorsInBox(self.CenterPosition, self.CenterPosition)
+			return self.World.ActorMap.GetUnitsAt(self.Location)
 				.FirstOrDefault(a => a.HasTrait<Reservable>());
 		}