diff --git a/src/cpl/configuration/configuration.py b/src/cpl/configuration/configuration.py
index ce567f10..d5c2e714 100644
--- a/src/cpl/configuration/configuration.py
+++ b/src/cpl/configuration/configuration.py
@@ -197,6 +197,7 @@ class Configuration(ConfigurationABC):
             # ?new value
             found = False
             for alias in argument_type.aliases:
+                alias = f' {alias} '
                 if alias in argument:
                     found = True
 
@@ -236,7 +237,7 @@ class Configuration(ConfigurationABC):
             self._additional_arguments.append(argument_type.name)
             result = True
 
-        if result:
+        if result and value == '':
             self._handled_args.append(argument)
             if next_arguments is not None and len(next_arguments) > 0:
                 next_args = []