diff --git a/src/CLI2.cpp b/src/CLI2.cpp
index c26292725..fe28203cc 100644
--- a/src/CLI2.cpp
+++ b/src/CLI2.cpp
@@ -363,7 +363,8 @@ void CLI2::handleTerminator ()
   std::vector <A2> reconstructed;
   for (auto& a : _args)
   {
-    if (a._lextype == Lexer::Type::separator)
+    if (a._lextype == Lexer::Type::separator &&
+        ! terminated)
     {
       terminated = true;
       changes = true;
diff --git a/src/Context.cpp b/src/Context.cpp
index 544678e39..1d972b6cd 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -230,7 +230,6 @@ int Context::initialize (int argc, const char** argv)
       cli2.add (argv[i]);
 
     cli2.analyze ();
-
     cli.initialize (argc, argv);
     cli.analyze (true, true);