diff --git a/core/assets/maps/test.mmap b/core/assets/maps/test.mmap
index 3703f2bb8a..00b8371971 100644
Binary files a/core/assets/maps/test.mmap and b/core/assets/maps/test.mmap differ
diff --git a/core/assets/version.properties b/core/assets/version.properties
index 2957275834..e38bcda1c8 100644
--- a/core/assets/version.properties
+++ b/core/assets/version.properties
@@ -1,5 +1,5 @@
 #Autogenerated file. Do not modify.
-#Tue Apr 17 17:05:43 EDT 2018
+#Tue Apr 17 17:15:02 EDT 2018
 version=release
 androidBuildCode=933
 name=Mindustry
diff --git a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java b/core/src/io/anuke/mindustry/editor/MapEditorDialog.java
index a7c412794a..95eadd2a92 100644
--- a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java
+++ b/core/src/io/anuke/mindustry/editor/MapEditorDialog.java
@@ -66,6 +66,7 @@ public class MapEditorDialog extends Dialog{
 			Timers.run(3f, () -> {
 
 				try{
+					tags.put("name", result.nameWithoutExtension());
 					MapIO.writeMap(result, tags, editor.getMap());
 				}catch (Exception e){
 					ui.showError(Bundles.format("text.editor.errorimagesave", Strings.parseException(e, false)));
@@ -96,7 +97,6 @@ public class MapEditorDialog extends Dialog{
 			FileHandle result = file;
 			ui.loadfrag.show();
 			Timers.run(3f, () -> {
-
 				try{
 					Pixmaps.write(MapIO.generatePixmap(editor.getMap()), result);
 				}catch (Exception e){
diff --git a/core/src/io/anuke/mindustry/io/Maps.java b/core/src/io/anuke/mindustry/io/Maps.java
index 2213304385..e10d1aecdd 100644
--- a/core/src/io/anuke/mindustry/io/Maps.java
+++ b/core/src/io/anuke/mindustry/io/Maps.java
@@ -65,7 +65,7 @@ public class Maps implements Disposable{
 
 		for(FileHandle file : customMapDirectory.list()){
 			try{
-				loadMap(file, true);
+				if(file.extension().toLowerCase().equals(mapExtension)) loadMap(file, true);
 			}catch (IOException e){
 				Log.err("Failed to load custom map file '{0}'!", file);
 				Log.err(e);