diff --git a/core/src/io/anuke/mindustry/core/World.java b/core/src/io/anuke/mindustry/core/World.java
index 50c035c264..90762e9997 100644
--- a/core/src/io/anuke/mindustry/core/World.java
+++ b/core/src/io/anuke/mindustry/core/World.java
@@ -494,7 +494,7 @@ public class World implements ApplicationListener{
 
         @Override
         public Tile create(int x, int y, int floorID, int overlayID, int wallID){
-            return new Tile(x, y, floorID, overlayID, wallID);
+            return (tiles[x][y] = new Tile(x, y, floorID, overlayID, wallID));
         }
 
         @Override
diff --git a/core/src/io/anuke/mindustry/editor/MapEditor.java b/core/src/io/anuke/mindustry/editor/MapEditor.java
index 02f5ece065..73cbae12a1 100644
--- a/core/src/io/anuke/mindustry/editor/MapEditor.java
+++ b/core/src/io/anuke/mindustry/editor/MapEditor.java
@@ -286,7 +286,7 @@ public class MapEditor{
 
         @Override
         public Tile create(int x, int y, int floorID, int overlayID, int wallID){
-            return new EditorTile(x, y, floorID, overlayID, wallID);
+            return (tiles()[x][y] = new EditorTile(x, y, floorID, overlayID, wallID));
         }
 
         @Override
diff --git a/core/src/io/anuke/mindustry/io/SaveVersion.java b/core/src/io/anuke/mindustry/io/SaveVersion.java
index ffa3df29c0..f46853dcf5 100644
--- a/core/src/io/anuke/mindustry/io/SaveVersion.java
+++ b/core/src/io/anuke/mindustry/io/SaveVersion.java
@@ -8,6 +8,7 @@ import io.anuke.mindustry.entities.Entities;
 import io.anuke.mindustry.entities.EntityGroup;
 import io.anuke.mindustry.entities.traits.*;
 import io.anuke.mindustry.game.*;
+import io.anuke.mindustry.maps.Map;
 import io.anuke.mindustry.type.ContentType;
 import io.anuke.mindustry.world.*;
 
@@ -70,6 +71,12 @@ public abstract class SaveVersion extends SaveFileReader{
         state.wavetime = map.getFloat("wavetime", state.rules.waveSpacing);
         state.stats = JsonIO.read(Stats.class, map.get("stats", "{}"));
         state.rules = JsonIO.read(Rules.class, map.get("rules", "{}"));
+        Map worldmap = world.maps.byName(map.get("mapname", "\\\\\\"));
+        world.setMap(worldmap == null ? new Map(StringMap.of(
+            "name", map.get("mapname", "Unknown"),
+            "width", 1,
+            "height", 1
+        )) : worldmap);
     }
 
     public void writeMap(DataOutput stream) throws IOException{
@@ -136,7 +143,6 @@ public abstract class SaveVersion extends SaveFileReader{
 
         if(!generating) context.begin();
 
-        //Tile[][] tiles = world.createTiles(width, height);
         context.resize(width, height);
 
         //read floor and create tiles first