diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java
index d205d2ba..637218e3 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java
@@ -307,6 +307,13 @@ public class CheckCommand extends SWCommand {
                     return;
                 }
 
+                // Remove any added players from the schematic in the folder
+                for (SchematicNode schematicNode : SchematicNode.getSchematicNodeInNode(teamFolder.getNodeId())) {
+                    for (NodeMember nodeMember : NodeMember.getNodeMembers(schematicNode.getNodeId())) {
+                        nodeMember.delete();
+                    }
+                }
+
                 // Copy Schem into team folder of -1 user
                 String name = DateTimeFormatter.ofPattern("yyyy.MM.dd_HH:mm:ss").format(schematic.getLastUpdate().toLocalDateTime());
                 NodeData data = NodeData.getLatest(schematic);
@@ -316,14 +323,8 @@ public class CheckCommand extends SWCommand {
                 // Accept the team folder schematic and set other to Normal as well as adding the original owner on the schematic
                 node.setSchemtype(GameModeConfig.getBySchematicType(schematic.getSchemtype()).Schematic.Type);
                 NodeMember.createNodeMember(node.getNodeId(), schematic.getOwner());
-
-                // Remove any added players from the schematic in the folder
-                for (SchematicNode schematicNode : SchematicNode.getSchematicNodeInNode(teamFolder.getNodeId())) {
-                    if (schematicNode.getNodeId() == node.getNodeId()) continue;
-                    for (NodeMember nodeMember : NodeMember.getNodeMembers(schematicNode.getNodeId())) {
-                        NodeMember.createNodeMember(node.getNodeId(), nodeMember.getMember());
-                        nodeMember.delete();
-                    }
+                for (NodeMember nodeMember : NodeMember.getNodeMembers(schematic.getId())) {
+                    NodeMember.createNodeMember(node.getNodeId(), nodeMember.getMember());
                 }
 
                 // Conclude by setting send in schematic to normal and broadcast