diff --git a/src/me/libraryaddict/disguise/utilities/BaseDisguiseCommand.java b/src/me/libraryaddict/disguise/utilities/BaseDisguiseCommand.java
index ad682775..74fc4ed7 100644
--- a/src/me/libraryaddict/disguise/utilities/BaseDisguiseCommand.java
+++ b/src/me/libraryaddict/disguise/utilities/BaseDisguiseCommand.java
@@ -581,7 +581,10 @@ public abstract class BaseDisguiseCommand implements CommandExecutor {
                 usedOptions.add(methodName.toLowerCase());
             }
             doCheck(optionPermissions, usedOptions);
-            methodToUse.invoke(disguise.getWatcher(), value);
+            if (methodToUse.getDeclaringClass().isAssignableFrom(FlagWatcher.class))
+                methodToUse.invoke(disguise.getWatcher(), value);
+            else
+                methodToUse.invoke(disguise, value);
         }
         // Alright. We've constructed our disguise.
         return disguise;