diff --git a/src/Parser.cpp b/src/Parser.cpp
index 8848180bc..6ffd2ee9c 100644
--- a/src/Parser.cpp
+++ b/src/Parser.cpp
@@ -334,6 +334,7 @@ void Parser::findCommand ()
     if (canonicalize (command, "cmd", (*i)->attribute ("raw")))
     {
       (*i)->unTag ("?");
+      (*i)->removeAllBranches ();
       (*i)->tag ("CMD");
       (*i)->attribute ("canonical", command);