diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/script/CustomScript.java b/BauSystem_Main/src/de/steamwar/bausystem/features/script/CustomScript.java
index deb73c3e..6eba26d3 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/script/CustomScript.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/script/CustomScript.java
@@ -204,21 +204,24 @@ public class CustomScript {
             if  (menuCommand.args.length != args.length) {
                 return false;
             }
+            if (!args[0].equals(menuCommand.args[0])) {
+                return false;
+            }
             for (int i = 0; i < args.length; i++) {
                 if (i == 0) continue;
                 String s1 = args[i];
                 String s2 = menuCommand.args[i];
-                if (s1.equals(s2)) {
-                    return true;
+                if (!s1.equals(s2)) {
+                    return false;
                 }
-                if (s1.startsWith("<") && s1.endsWith(">") && s2.startsWith("<") && s2.endsWith(">")) {
-                    return true;
+                if (!(s1.startsWith("<") && s1.endsWith(">") && s2.startsWith("<") && s2.endsWith(">"))) {
+                    return false;
                 }
-                if (s1.startsWith("(<") && s1.endsWith(">)") && s2.startsWith("(<") && s2.endsWith(">)")) {
-                    return true;
+                if (!(s1.startsWith("(<") && s1.endsWith(">)") && s2.startsWith("(<") && s2.endsWith(">)"))) {
+                    return false;
                 }
             }
-            return false;
+            return true;
         }
 
         @Override