diff --git a/src/CLI.cpp b/src/CLI.cpp
index d504c76fe..868e4a7f2 100644
--- a/src/CLI.cpp
+++ b/src/CLI.cpp
@@ -385,10 +385,10 @@ void CLI::analyze (bool parse /* = true */, bool strict /* = false */)
   {
     std::string raw = _original_args[i];
     A a ("arg", raw);
+    a.tag ("ORIGINAL");
 
     if (i == 0)
     {
-      a.tag ("ORIGINAL");
       a.tag ("BINARY");
 
       std::string basename = "task";
@@ -402,11 +402,6 @@ void CLI::analyze (bool parse /* = true */, bool strict /* = false */)
       else if (basename == "task" || basename == "tw" || basename == "t")
         a.tag ("TW");
     }
-    else
-    {
-      A a ("arg", raw);
-      a.tag ("ORIGINAL");
-    }
 
     _args.push_back (a);
   }