diff --git a/evennia/commands/cmdset.py b/evennia/commands/cmdset.py
index 7328ac855d..58912003db 100644
--- a/evennia/commands/cmdset.py
+++ b/evennia/commands/cmdset.py
@@ -411,7 +411,7 @@ class CmdSet(object):
             elif mergetype == "Replace":
                 cmdset_c = self._replace(cmdset_b, self)
             elif mergetype == "Remove":
-                cmdset_c = self._remove(self, cmdset_b)
+                cmdset_c = self._remove(cmdset_b, self)
             else:  # Union
                 cmdset_c = self._union(cmdset_b, self)
             cmdset_c.no_channels = cmdset_b.no_channels
diff --git a/evennia/commands/command.py b/evennia/commands/command.py
index 23eb2f15a8..eaf435e5df 100644
--- a/evennia/commands/command.py
+++ b/evennia/commands/command.py
@@ -184,7 +184,8 @@ class Command(object):
         """
         try:
             # first assume input is a command (the most common case)
-            return cmd.key in self._matchset
+            return self._matchset.intersection(cmd._matchset)
+            #return cmd.key in self._matchset
         except AttributeError:
             # probably got a string
             return cmd in self._matchset