diff --git a/lib/core/option.py b/lib/core/option.py
index 7ea6b67de..ab3f119a3 100644
--- a/lib/core/option.py
+++ b/lib/core/option.py
@@ -1828,10 +1828,8 @@ def _saveCmdline():
                 if datatype == OPTION_TYPE.BOOLEAN:
                     value = "False"
                 elif datatype in (OPTION_TYPE.INTEGER, OPTION_TYPE.FLOAT):
-                    if option in ("threads", "verbose"):
-                        value = "1"
-                    elif option == "timeout":
-                        value = "10"
+                    if option in defaults:
+                        value = str(defaults[option])
                     else:
                         value = "0"
                 elif datatype == OPTION_TYPE.STRING: