diff --git a/public/project/floors/MT91.js b/public/project/floors/MT91.js
index b60f3b1..2b953c4 100644
--- a/public/project/floors/MT91.js
+++ b/public/project/floors/MT91.js
@@ -35,19 +35,19 @@ main.floors.MT91=
     "cannotMoveIn": {},
     "map": [
     [648,648,648,648,648,648,648,648,648,648,648,648,648,648,648],
-    [648,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,648],
-    [648,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,648],
-    [648,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,648],
-    [648,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,648],
-    [648,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,648],
-    [648,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,648],
-    [ 92,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 94],
-    [648,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,648],
-    [648,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,648],
-    [648,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,648],
-    [648,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,648],
-    [648,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,648],
-    [648,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,648],
+    [648,  0,  0,  0,648,  0,  0,  0,  0,  0,  0,  0,648,  0,648],
+    [648,  0,  0,  0,  0,  0,  0,648,648,648,  0,  0,648,  0,648],
+    [648,648,648,648,648,648,648,648,  0,648,  0,648,648,  0,648],
+    [648,  0,648,  0,  0,  0,  0,  0,  0,648,  0,  0,  0,  0,648],
+    [648,  0,  0,  0,648,  0,648,648,648,648,  0,648,648,648,648],
+    [648,648,648,648,648,  0,  0,  0,  0,  0,  0,648,  0,  0,648],
+    [ 92,  0,  0,  0,648,  0,648,648,  0,648,  0,648,  0,  0, 94],
+    [648,  0,  0,  0,  0,  0,  0,648,  0,648,648,648,  0,648,648],
+    [648,648,648,648,648,648,  0,648,  0,  0,  0,  0,  0,  0,648],
+    [648,  0,  0,  0,  0,  0,  0,648,  0,  0,648,  0,648,  0,648],
+    [648,  0,648,648,  0,648,648,648,648,648,648,  0,648,  0,648],
+    [648,  0,  0,648,  0,648,  0,  0,  0,648,  0,  0,648,  0,648],
+    [648,  0,  0,648,  0,648,  0,  0,  0,  0,  0,  0,648,  0,648],
     [648,648,648,648,648,648,648, 93,648,648,648,648,648,648,648]
 ],
     "bgmap": [
diff --git a/src/game/state/move.ts b/src/game/state/move.ts
index 5d0cd7d..cb5aaf3 100644
--- a/src/game/state/move.ts
+++ b/src/game/state/move.ts
@@ -425,8 +425,7 @@ export class HeroMover extends ObjectMoverBase {
         const map = core.status.thisMap.enemy.mapDamage;
         const dam = map[index];
         const nextDam = map[nIndex];
-        if (!dam) return false;
-        if (nextDam.mockery || (!dam.hunt && nextDam.hunt)) {
+        if (nextDam?.mockery || (!dam?.hunt && nextDam?.hunt)) {
             core.autosave();
             return true;
         }