diff --git a/src/Context.cpp b/src/Context.cpp
index 65d82d605..cbd1238b3 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -385,7 +385,6 @@ int Context::dispatch (std::string &out)
   if (command != "")
   {
     updateXtermTitle ();
-
     updateVerbosity ();
 
     Command* c = commands[command];
diff --git a/src/Parser.cpp b/src/Parser.cpp
index fe839f203..1beee8a12 100644
--- a/src/Parser.cpp
+++ b/src/Parser.cpp
@@ -595,7 +595,7 @@ std::string Parser::getLimit () const
   for (i = _tree->_branches.begin (); i != _tree->_branches.end (); ++i)
   {
     // Parser override operator.
-    if ((*i)->attribute ("raw") == "TERMINATED")
+    if ((*i)->attribute ("raw") == "--")
       break;
 
     if ((*i)->hasTag ("PSEUDO") &&
@@ -615,11 +615,11 @@ std::string Parser::getCommand () const
   for (i = _tree->_branches.begin (); i != _tree->_branches.end (); ++i)
   {
     // Parser override operator.
-    if ((*i)->attribute ("canonical") == "TERMINATED")
+    if ((*i)->attribute ("raw") == "--")
       break;
 
     if ((*i)->hasTag ("CMD"))
-      return (*i)->attribute ("raw");
+      return (*i)->attribute ("canonical");
   }
 
   return "";