diff --git a/src/de/steamwar/bungeecore/SubserverSystem.java b/src/de/steamwar/bungeecore/SubserverSystem.java
index 9e08df5c..877dec8e 100644
--- a/src/de/steamwar/bungeecore/SubserverSystem.java
+++ b/src/de/steamwar/bungeecore/SubserverSystem.java
@@ -96,6 +96,8 @@ public class SubserverSystem {
         if(mapName == null)
             mapName = serverName;
 
+        mapName = mapName.replace(' ', '_').replace("[", "").replace("]", "");
+
         String worldDir;
         if(eventFightID > 0)
             worldDir = EVENT_PATH;
@@ -138,7 +140,7 @@ public class SubserverSystem {
                 0,
                 0,
                 serverName,
-                serverName.replace(' ', '_') + eventFight.getStartTime().toLocalDateTime().format(DateTimeFormatter.ISO_TIME),
+                serverName + eventFight.getStartTime().toLocalDateTime().format(DateTimeFormatter.ISO_TIME),
                 null,
                 null,
                 false);