diff --git a/src/Parser.cpp b/src/Parser.cpp
index a52409baa..8848180bc 100644
--- a/src/Parser.cpp
+++ b/src/Parser.cpp
@@ -293,12 +293,14 @@ void Parser::findTerminator ()
         (*i)->attribute ("raw") == "--")
     {
       (*i)->unTag ("?");
+      (*i)->removeAllBranches ();
       (*i)->tag ("TERMINATOR");
       found = true;
     }
     else if (found)
     {
       (*i)->unTag ("?");
+      (*i)->removeAllBranches ();
       (*i)->tag ("WORD");
       (*i)->tag ("TERMINATED");
     }