diff --git a/libs/maps.js b/libs/maps.js
index 22d7a62a..c9c42891 100644
--- a/libs/maps.js
+++ b/libs/maps.js
@@ -164,9 +164,9 @@ maps.prototype.save = function(maps, floorId) {
     var mh = core.floors[floorId].height || 13;
 
     var blocks = [];
-    for (var x=0;x<mw;x++) {
+    for (var x=0;x<mh;x++) {
         blocks[x]=[];
-        for (var y=0;y<mh;y++) {
+        for (var y=0;y<mw;y++) {
             blocks[x].push(0);
         }
     }
@@ -215,9 +215,9 @@ maps.prototype.load = function (data, floorId) {
 maps.prototype.getMapArray = function (blockArray,width,height){
 
     var blocks = [];
-    for (var x=0;x<width;x++) {
+    for (var x=0;x<height;x++) {
         blocks[x]=[];
-        for (var y=0;y<height;y++) {
+        for (var y=0;y<width;y++) {
             blocks[x].push(0);
         }
     }
diff --git a/libs/ui.js b/libs/ui.js
index d5f269d5..8dc605f4 100644
--- a/libs/ui.js
+++ b/libs/ui.js
@@ -1827,8 +1827,8 @@ ui.prototype.drawThumbnail = function(floorId, canvas, blocks, x, y, size, cente
     var blockIcon = core.material.icons.terrains[groundId];
     var blockImage = core.material.images.terrains;
     // background
-    for (var i=0;i<mw;i++) {
-        for (var j=0;j<mh;j++) {
+    for (var j=0;j<mh;j++) {
+        for (var i=0;i<mw;i++) {
             tempCanvas.drawImage(blockImage, 0, blockIcon * 32, 32, 32, i * 32, j * 32, 32, 32);
         }
     }