diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index ac95598048..e42c946807 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -1024,10 +1024,10 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             switch (flag & 0xffff)
             {
             case 0:
-                block.MapImageId = m_scene.RegionInfo.RegionSettings.ParcelImageID;
+                block.MapImageId = r.TerrainImage;
                 break;
             case 2:
-                block.MapImageId = m_scene.RegionInfo.RegionSettings.ParcelImageID;
+                block.MapImageId = r.ParcelImage;
                 break;
             default:
                 block.MapImageId = UUID.Zero;