diff --git a/src/Misc.py b/src/Misc.py
index d21d7e4c5..27ba568b0 100755
--- a/src/Misc.py
+++ b/src/Misc.py
@@ -91,7 +91,7 @@ class Misc(callbacks.Privmsg):
                 commands = []
                 for s in dir(cb):
                     if cb.isCommand(s) and \
-                       s != name and \
+                       (s != name or cb._original) and \
                        s == callbacks.canonicalName(s):
                         method = getattr(cb, s)
                         if hasattr(method, '__doc__') and method.__doc__:
diff --git a/test/test_Misc.py b/test/test_Misc.py
index d7632ab5b..54b0b9efc 100644
--- a/test/test_Misc.py
+++ b/test/test_Misc.py
@@ -32,7 +32,7 @@
 from testsupport import *
 
 class MiscTestCase(ChannelPluginTestCase, PluginDocumentation):
-    plugins = ('Misc', 'Utilities', 'Gameknot', 'Ctcp')
+    plugins = ('Misc', 'Utilities', 'Gameknot', 'Ctcp', 'Dict')
     def testAction(self):
         self.assertAction('action moos', 'moos')
         self.assertAction('action','')
@@ -91,6 +91,9 @@ class MiscTestCase(ChannelPluginTestCase, PluginDocumentation):
     def testListNoIncludeDispatcher(self):
         self.assertNotRegexp('list Misc', 'misc')
 
+    def testListIncludesDispatcherIfThereIsAnOriginalCommand(self):
+        self.assertRegexp('list Dict', r'\bdict\b')
+
     def testVersion(self):
         self.assertNotError('version')