diff --git a/SpigotCore_Main/src/de/steamwar/command/SWCommand.java b/SpigotCore_Main/src/de/steamwar/command/SWCommand.java
index 20f1d5c..3b6245d 100644
--- a/SpigotCore_Main/src/de/steamwar/command/SWCommand.java
+++ b/SpigotCore_Main/src/de/steamwar/command/SWCommand.java
@@ -47,14 +47,8 @@ public abstract class SWCommand {
         this.command = new Command(command, "", "/" + command, Arrays.asList(aliases)) {
             @Override
             public boolean execute(CommandSender sender, String alias, String[] args) {
-                // if (commandList.stream().filter(s -> s.invoke(sender, args)).findFirst().isPresent()) return false;
-                // if (commandHelpList.stream().filter(s -> s.invoke(sender, args)).findFirst().isPresent()) return false;
-                for (SubCommand subCommand : commandList) {
-                    if (subCommand.invoke(sender, args)) return false;
-                }
-                for (SubCommand subCommand : commandHelpList) {
-                    if (subCommand.invoke(sender, args)) return false;
-                }
+                if (commandList.stream().anyMatch(s -> s.invoke(sender, args))) return false;
+                commandHelpList.stream().anyMatch(s -> s.invoke(sender, args));
                 return false;
             }