diff --git a/OpenDiablo2.Common/Enums/eLevelSubType.cs b/OpenDiablo2.Common/Enums/eLevelSubType.cs
index 6e8b75d4..bc847833 100644
--- a/OpenDiablo2.Common/Enums/eLevelSubType.cs
+++ b/OpenDiablo2.Common/Enums/eLevelSubType.cs
@@ -2,8 +2,8 @@
 {
     public enum eLevelSubType
     {
-        Act1BorderCliff = 1,
-        Act1BorderMiddle = 2,
+        Act1BorderCliff = 0,
+        Act1BorderMiddle = 1,
         Act1BorderCorner = 2,
         Act1BorderBorder = 3,
         Act1Waypoint = 4,
diff --git a/OpenDiablo2.Core/GameState/GameState.cs b/OpenDiablo2.Core/GameState/GameState.cs
index c361233a..64c18769 100644
--- a/OpenDiablo2.Core/GameState/GameState.cs
+++ b/OpenDiablo2.Core/GameState/GameState.cs
@@ -133,11 +133,6 @@ namespace OpenDiablo2.Core.GameState_
 
         public MapInfo LoadMap(eLevelId levelId, Point origin)
         {
-            // Don't generate the map if it doesn't already exist
-            var existing = mapInfo.FirstOrDefault(x => x.LevelId == levelId);
-            if (existing != null)
-                return existing;
-
             var level = engineDataManager.LevelPresets.First(x => x.LevelId == (int)levelId);
             var levelDetails = engineDataManager.LevelDetails.First(x => x.Id == level.LevelId);
             var levelType = engineDataManager.LevelTypes.First(x => x.Id == levelDetails.LevelType);