diff --git a/src/me/yaruma/fightsystem/commands/AkCommand.java b/src/me/yaruma/fightsystem/commands/AkCommand.java
index 4abf629..a4d9337 100644
--- a/src/me/yaruma/fightsystem/commands/AkCommand.java
+++ b/src/me/yaruma/fightsystem/commands/AkCommand.java
@@ -153,9 +153,13 @@ public class AkCommand implements CommandExecutor {
 
                 Schematic schem = Schematic.getSchemFromDB(args[1], player.getUniqueId());
                 if(schem == null) {
-                    player.sendMessage(FightSystem.PREFIX + "§cDiese Schematic gibt es nicht!");
-                    return false;
-                }else if(schem.getSchemType() != Config.SchematicType) {
+                    schem = Schematic.getSchemFromDB(args[1], 0);
+                    if(schem == null){
+                        player.sendMessage(FightSystem.PREFIX + "§cDiese Schematic gibt es nicht!");
+                        return false;
+                    }
+                }
+                if(schem.getSchemType() != Config.SchematicType) {
                     player.sendMessage(FightSystem.PREFIX + "§cDiese Schematic ist kein " + Config.GameName);
                     return false;
                 }
diff --git a/src/me/yaruma/fightsystem/fight/FightTeam.java b/src/me/yaruma/fightsystem/fight/FightTeam.java
index 51a4f17..cda7fde 100644
--- a/src/me/yaruma/fightsystem/fight/FightTeam.java
+++ b/src/me/yaruma/fightsystem/fight/FightTeam.java
@@ -204,7 +204,7 @@ public class FightTeam {
         List<Schematic> preSchematicList;
         List<Schematic> schematicList = new ArrayList<>();
         if(publicSchematics) {
-            preSchematicList = Schematic.getSchemsOfType(0, schematicType);
+            preSchematicList = Schematic.getSchemsAccessibleByUser(0);
         } else {
             preSchematicList = Schematic.getSchemsAccessibleByUser(player.getUniqueId());
         }