diff --git a/libs/events.js b/libs/events.js
index 3cad299e..27627d6e 100644
--- a/libs/events.js
+++ b/libs/events.js
@@ -1810,7 +1810,7 @@ events.prototype.moveImage = function (code, to, opacityVal, time, callback) {
     var animate = setInterval(function () {
         step++;
         moveStep();
-        if (step > steps) {
+        if (step == steps) {
             if (core.isset(opacityVal))
                 core.setOpacity(name, opacityVal);
             delete core.animateFrame.asyncId[animate];
diff --git a/libs/maps.js b/libs/maps.js
index 3ad953a4..c0ba3b1f 100644
--- a/libs/maps.js
+++ b/libs/maps.js
@@ -208,13 +208,14 @@ maps.prototype.decompressMap = function (mapArr, floorId) {
     var mw = core.floors[floorId].width || 13;
     var mh = core.floors[floorId].height || 13;
     for (var x=0;x<mh;x++) {
+        var floorMap = core.floors.map[x] || [];
         if (mapArr[x] === 0) {
-            mapArr[x] = core.clone(core.floors[floorId].map[x]);
+            mapArr[x] = floorMap;
         }
         else {
             for (var y=0;y<mw;y++) {
                 if (mapArr[x][y] === -1) {
-                    mapArr[x][y] = core.floors[floorId].map[x][y];
+                    mapArr[x][y] = floorMap[y] || 0;
                 }
             }
         }