diff --git a/src/host/main.cpp b/src/host/main.cpp
index c953fc53e6373e7018fa8b37abe6bbe7d39bb9a5..1666bf2690f07bb4705cfcde5262539121185af9 100644
--- a/src/host/main.cpp
+++ b/src/host/main.cpp
@@ -122,7 +122,11 @@ int SplitOptionAndCommand(int argc, const char **argv, string &outOption, string
             outCommand += rawCmd.find(" ") == string::npos ? rawCmd : packageCmd;
         } else {
             outOption += outOption.size() ? " " : "";
-            outOption += argv[i];
+            if (i == 0) {
+                outOption += Base::StringFormat("\"%s\"", argv[i]);
+            } else {
+                outOption += argv[i];
+            }
         }
     }
     return 0;