diff --git a/src/de/steamwar/bungeecore/commands/CheckCommand.java b/src/de/steamwar/bungeecore/commands/CheckCommand.java
index 801daa52..a1ca6814 100644
--- a/src/de/steamwar/bungeecore/commands/CheckCommand.java
+++ b/src/de/steamwar/bungeecore/commands/CheckCommand.java
@@ -187,9 +187,6 @@ public class CheckCommand extends BasicCommand {
             this.startTime = Timestamp.from(Instant.now());
             this.checkList = checkQuestions.get(schematic.getSchemType()).listIterator();
 
-            currentCheckers.put(checker, this);
-            currentSchems.put(schematic.getSchemID(), this);
-
             ProxyServer.getInstance().getScheduler().runAsync(BungeeCore.get(), () -> {
                 for (Subserver subserver : Subserver.getServerList()) {
                     if (subserver.getType() == Servertype.BAUSERVER && ((Bauserver) subserver).getOwner().equals(checker.getUniqueId())) {
@@ -200,9 +197,10 @@ public class CheckCommand extends BasicCommand {
 
                 ArenaMode mode = ArenaMode.getByCheckSchemType(schematic.getSchemType().toDB());
                 SubserverSystem.sendToTestServer(checker, mode, FightCommand.getMap(checker, mode, "Random"), schematic.getSchemID());
+                currentCheckers.put(checker, this);
+                currentSchems.put(schematic.getSchemID(), this);
+                next();
             });
-
-            next();
         }
 
         private void next() {
diff --git a/src/de/steamwar/bungeecore/commands/TpCommand.java b/src/de/steamwar/bungeecore/commands/TpCommand.java
index 1815e201..48d30e2a 100644
--- a/src/de/steamwar/bungeecore/commands/TpCommand.java
+++ b/src/de/steamwar/bungeecore/commands/TpCommand.java
@@ -54,7 +54,7 @@ public class TpCommand extends BasicCommand {
             return true;
         }else if(CheckCommand.isChecking(player)){
             BungeeCore.send(player, BungeeCore.CHAT_PREFIX + "§cDu prüfst gerade eine Schematic!");
-            return false;
+            return true;
         }
 
         //Get target player server
diff --git a/src/de/steamwar/bungeecore/sql/Schematic.java b/src/de/steamwar/bungeecore/sql/Schematic.java
index f9fa2858..3f2dc454 100644
--- a/src/de/steamwar/bungeecore/sql/Schematic.java
+++ b/src/de/steamwar/bungeecore/sql/Schematic.java
@@ -90,6 +90,6 @@ public class Schematic {
 
     public void setSchemType(SchematicType schemType) {
         this.schemType = schemType;
-        SQL.update("UPDATE Schematic SET SchemType = ? WHERE SchemID = ?", schemType, schemID);
+        SQL.update("UPDATE Schematic SET SchemType = ? WHERE SchemID = ?", schemType.toDB(), schemID);
     }
 }