diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/backup/BackupCommand.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/backup/BackupCommand.java
index 393549b7..6c7708c9 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/backup/BackupCommand.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/backup/BackupCommand.java
@@ -120,12 +120,12 @@ public class BackupCommand extends SWCommand {
         return new TypeMapper<RegionBackups.Backup>() {
             @Override
             public RegionBackups.Backup map(CommandSender commandSender, String[] previousArguments, String s) {
-                return Region.getRegion(((Player) commandSender).getLocation()).getBackups().get(s.replace('_', ' '));
+                return Region.getRegion(((Player) commandSender).getLocation()).getBackups().get(s);
             }
 
             @Override
             public Collection<String> tabCompletes(CommandSender sender, PreviousArguments previousArguments, String s) {
-                return listBackup((Player) sender).stream().map(RegionBackups.Backup::getName).map(name -> name.replace(' ', '_')).collect(Collectors.toList());
+                return listBackup((Player) sender).stream().map(RegionBackups.Backup::getName).collect(Collectors.toList());
             }
         };
     }
diff --git a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java
index ed109105..7d58262c 100644
--- a/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java
+++ b/BauSystem/BauSystem_RegionFixed/src/de/steamwar/bausystem/region/fixed/FixedRegion.java
@@ -100,10 +100,10 @@ public class FixedRegion implements Region {
         @Nullable
         @Override
         public Backup get(String name) {
-            final File definedBackupFolder = new File(new File(backupFolder, prototype.getName()), name);
+            final File definedBackupFolder = new File(new File(backupFolder, prototype.getName()), FixedRegion.this.name);
             //noinspection ResultOfMethodCallIgnored
             definedBackupFolder.mkdirs();
-            File[] files = definedBackupFolder.listFiles((dir, s) -> s.equals(name + ".schem"));
+            File[] files = definedBackupFolder.listFiles((dir, s) -> s.equals(name.replace('_', ' ') + ".schem"));
             if (files == null || files.length == 0) return null;
             return new BackupImpl(files[0]);
         }
@@ -114,7 +114,7 @@ public class FixedRegion implements Region {
         private final File file;
 
         public BackupImpl(File file) {
-            super(RegionBackups.BackupType.AUTOMATIC, file.getName(), flagStorage);
+            super(RegionBackups.BackupType.AUTOMATIC, file.getName().replace(' ', '_'), flagStorage);
             this.file = file;
         }