diff --git a/src/Parser.cpp b/src/Parser.cpp
index a9fb9aac0..dca7f77ed 100644
--- a/src/Parser.cpp
+++ b/src/Parser.cpp
@@ -444,9 +444,8 @@ void Parser::resolveAliases ()
 // autoCompletes to a valid command/report.
 void Parser::findCommand ()
 {
-  context.debug ("Parse::findCommand");
   std::vector <Tree*> nodes;
-  collect (nodes);
+  collect (nodes, collectAll);
 
   // There can be only one.
   // Scan for an existing CMD tag, to short-circuit scanning for another.
@@ -474,8 +473,6 @@ void Parser::findCommand ()
       return;
     }
   }
-
-  context.debug (_tree->dump ());
 }
 
 ////////////////////////////////////////////////////////////////////////////////