diff --git a/src/core/model/command-line.h b/src/core/model/command-line.h
index 5f1aa3358..a4e8512f9 100644
--- a/src/core/model/command-line.h
+++ b/src/core/model/command-line.h
@@ -742,7 +742,7 @@ CommandLine::AddValue(const std::string& name, const std::string& help, T& value
 
     std::stringstream ss;
     ss << value;
-    ss >> item->m_default;
+    item->m_default = ss.str(); // Including white spaces
 
     m_options.push_back(item);
 }