diff --git a/src/CLI.cpp b/src/CLI.cpp
index 3ce0e7db5..7109a9022 100644
--- a/src/CLI.cpp
+++ b/src/CLI.cpp
@@ -499,11 +499,12 @@ void CLI::categorize ()
 
     if (raw == "--")
     {
+      a->unTagAll ();
       a->tag ("TERMINATOR");
       terminated = true;
     }
 
-    if (terminated)
+    else if (terminated)
     {
       a->unTagAll ();
       a->tag ("TERMINATED");