diff --git a/src/Owner.py b/src/Owner.py
index 882ae823d..d292dceec 100644
--- a/src/Owner.py
+++ b/src/Owner.py
@@ -105,7 +105,7 @@ class Owner(privmsgs.CapabilityCheckingPrivmsg):
                         ambiguousCommands[command] = names
             for elt in tokens:
                 if isinstance(elt, list):
-                    self._disambiguate(elt)
+                    self._disambiguate(irc, elt, ambiguousCommands)
 
     def doPrivmsg(self, irc, msg):
         callbacks.Privmsg.handled = False
diff --git a/test/test_callbacks.py b/test/test_callbacks.py
index 8c11677a6..1db9a3c2a 100644
--- a/test/test_callbacks.py
+++ b/test/test_callbacks.py
@@ -256,6 +256,7 @@ class PrivmsgTestCase(ChannelPluginTestCase):
         self.assertNotError('firstcmd')
         self.irc.addCallback(self.FirstRepeat())
         self.assertError('firstcmd')
+        self.assertError('firstcmd [firstcmd]')
         self.assertNotRegexp('firstcmd', '(foo.*baz|baz.*foo)')
         self.assertResponse('first firstcmd', 'foo')
         self.assertResponse('firstrepeat firstcmd', 'baz')