diff --git a/OpenRA.Game/Traits/World/Shroud.cs b/OpenRA.Game/Traits/World/Shroud.cs
index efc1bd498b..67fd8f42a6 100644
--- a/OpenRA.Game/Traits/World/Shroud.cs
+++ b/OpenRA.Game/Traits/World/Shroud.cs
@@ -128,8 +128,9 @@ namespace OpenRA.Traits
 
 			foreach (var c in visible)
 			{
-				visibleCount[c]++;
-				explored[c] = true;
+				var uv = c.ToMPos(map);
+				visibleCount[uv]++;
+				explored[uv] = true;
 			}
 
 			if (visibility.ContainsKey(a))
@@ -146,7 +147,7 @@ namespace OpenRA.Traits
 				return;
 
 			foreach (var c in visible)
-				visibleCount[c]--;
+				visibleCount[c.ToMPos(map)]--;
 
 			visibility.Remove(a);
 			Invalidate(visible);