diff --git a/OpenRA.Mods.Common/UtilityCommands/GetMapHashCommand.cs b/OpenRA.Mods.Common/UtilityCommands/GetMapHashCommand.cs
index 1923c84600..6747373adf 100644
--- a/OpenRA.Mods.Common/UtilityCommands/GetMapHashCommand.cs
+++ b/OpenRA.Mods.Common/UtilityCommands/GetMapHashCommand.cs
@@ -24,9 +24,8 @@ namespace OpenRA.Mods.Common.UtilityCommands
 		[Desc("MAPFILE", "Generate hash of specified oramap file.")]
 		public void Run(ModData modData, string[] args)
 		{
-			Game.ModData = modData;
-			var result = new Map(args[1]).Uid;
-			Console.WriteLine(result);
+			using (var package = modData.ModFiles.OpenPackage(args[1]))
+				Console.WriteLine(Map.ComputeUID(package));
 		}
 	}
 }