diff --git a/src/cpl_cli/cli.py b/src/cpl_cli/cli.py
index 278ff989..4683ed03 100644
--- a/src/cpl_cli/cli.py
+++ b/src/cpl_cli/cli.py
@@ -86,6 +86,9 @@ class CLI(ApplicationABC):
                     result = self._configuration.get_configuration(cmd.name)
                     result_args: list[str] = self._configuration.get_configuration(f'{cmd.name}AdditionalArguments')
                     is_option = False
+                    if result is None:
+                        continue
+
                     for opt in self._options:
                         if opt == result:
                             is_option = True
@@ -117,6 +120,7 @@ class CLI(ApplicationABC):
                 Error.error(f'Expected command')
                 return
 
+            Console.write_line(command, args)
             self._command_handler.handle(command, args)
         except KeyboardInterrupt:
             Console.write_line()
diff --git a/src/cpl_cli/cpl_cli.json b/src/cpl_cli/cpl_cli.json
index 006c1c08..c211e09d 100644
--- a/src/cpl_cli/cpl_cli.json
+++ b/src/cpl_cli/cpl_cli.json
@@ -4,7 +4,7 @@
     "Version": {
       "Major": "2021",
       "Minor": "10",
-      "Micro": "0.post1"
+      "Micro": "0.post2"
     },
     "Author": "Sven Heidemann",
     "AuthorEmail": "sven.heidemann@sh-edraft.de",
diff --git a/src/cpl_core/__init__.py b/src/cpl_core/__init__.py
index 0c3d2958..c99c48d6 100644
--- a/src/cpl_core/__init__.py
+++ b/src/cpl_core/__init__.py
@@ -15,11 +15,11 @@ __title__ = 'cpl_core'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.0'
+__version__ = '2021.10.0.post1'
 
 from collections import namedtuple
 
 # imports:
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='0')
+version_info = VersionInfo(major='2021', minor='10', micro='0.post1')
diff --git a/src/cpl_core/application/__init__.py b/src/cpl_core/application/__init__.py
index 24af4c32..849c5f96 100644
--- a/src/cpl_core/application/__init__.py
+++ b/src/cpl_core/application/__init__.py
@@ -15,7 +15,7 @@ __title__ = 'cpl_core.application'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.0'
+__version__ = '2021.10.0.post1'
 
 from collections import namedtuple
 
@@ -26,4 +26,4 @@ from .application_builder_abc import ApplicationBuilderABC
 from .startup_abc import StartupABC
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='0')
+version_info = VersionInfo(major='2021', minor='10', micro='0.post1')
diff --git a/src/cpl_core/configuration/__init__.py b/src/cpl_core/configuration/__init__.py
index 922312e4..1051f82e 100644
--- a/src/cpl_core/configuration/__init__.py
+++ b/src/cpl_core/configuration/__init__.py
@@ -15,7 +15,7 @@ __title__ = 'cpl_core.configuration'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.0'
+__version__ = '2021.10.0.post1'
 
 from collections import namedtuple
 
@@ -27,4 +27,4 @@ from .configuration_variable_name_enum import ConfigurationVariableNameEnum
 from .console_argument import ConsoleArgument
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='0')
+version_info = VersionInfo(major='2021', minor='10', micro='0.post1')
diff --git a/src/cpl_core/configuration/configuration.py b/src/cpl_core/configuration/configuration.py
index a1fa351e..aaf7d457 100644
--- a/src/cpl_core/configuration/configuration.py
+++ b/src/cpl_core/configuration/configuration.py
@@ -199,7 +199,7 @@ class Configuration(ConfigurationABC):
                 if alias == argument or f' {alias} ' == argument:
                     found = True
 
-            if argument_type.name not in argument and not found:
+            if argument_type.name != argument and not found:
                 return False
 
             if (next_arguments is None or len(next_arguments) == 0) and \
diff --git a/src/cpl_core/console/__init__.py b/src/cpl_core/console/__init__.py
index b6a2e2da..80fa8c2c 100644
--- a/src/cpl_core/console/__init__.py
+++ b/src/cpl_core/console/__init__.py
@@ -15,7 +15,7 @@ __title__ = 'cpl_core.console'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.0'
+__version__ = '2021.10.0.post1'
 
 from collections import namedtuple
 
@@ -27,4 +27,4 @@ from .foreground_color_enum import ForegroundColorEnum
 from .spinner_thread import SpinnerThread
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='0')
+version_info = VersionInfo(major='2021', minor='10', micro='0.post1')
diff --git a/src/cpl_core/cpl_core.json b/src/cpl_core/cpl_core.json
index e82e2f4b..ac7c4bc7 100644
--- a/src/cpl_core/cpl_core.json
+++ b/src/cpl_core/cpl_core.json
@@ -4,7 +4,7 @@
     "Version": {
       "Major": "2021",
       "Minor": "10",
-      "Micro": "0"
+      "Micro": "0.post1"
     },
     "Author": "Sven Heidemann",
     "AuthorEmail": "sven.heidemann@sh-edraft.de",
diff --git a/src/cpl_core/database/__init__.py b/src/cpl_core/database/__init__.py
index 01f60194..b1d37377 100644
--- a/src/cpl_core/database/__init__.py
+++ b/src/cpl_core/database/__init__.py
@@ -15,7 +15,7 @@ __title__ = 'cpl_core.database'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.0'
+__version__ = '2021.10.0.post1'
 
 from collections import namedtuple
 
@@ -25,4 +25,4 @@ from .database_settings import DatabaseSettings
 from .database_settings_name_enum import DatabaseSettingsNameEnum
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='0')
+version_info = VersionInfo(major='2021', minor='10', micro='0.post1')
diff --git a/src/cpl_core/database/connection/__init__.py b/src/cpl_core/database/connection/__init__.py
index 235bfcf7..aad523aa 100644
--- a/src/cpl_core/database/connection/__init__.py
+++ b/src/cpl_core/database/connection/__init__.py
@@ -15,7 +15,7 @@ __title__ = 'cpl_core.database.connection'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.0'
+__version__ = '2021.10.0.post1'
 
 from collections import namedtuple
 
@@ -24,4 +24,4 @@ from .database_connection import DatabaseConnection
 from .database_connection_abc import DatabaseConnectionABC
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='0')
+version_info = VersionInfo(major='2021', minor='10', micro='0.post1')
diff --git a/src/cpl_core/database/context/__init__.py b/src/cpl_core/database/context/__init__.py
index bebbf13d..ad43877e 100644
--- a/src/cpl_core/database/context/__init__.py
+++ b/src/cpl_core/database/context/__init__.py
@@ -15,7 +15,7 @@ __title__ = 'cpl_core.database.context'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.0'
+__version__ = '2021.10.0.post1'
 
 from collections import namedtuple
 
@@ -24,4 +24,4 @@ from .database_context import DatabaseContext
 from .database_context_abc import DatabaseContextABC
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='0')
+version_info = VersionInfo(major='2021', minor='10', micro='0.post1')
diff --git a/src/cpl_core/dependency_injection/__init__.py b/src/cpl_core/dependency_injection/__init__.py
index 5824b419..4134e74e 100644
--- a/src/cpl_core/dependency_injection/__init__.py
+++ b/src/cpl_core/dependency_injection/__init__.py
@@ -15,7 +15,7 @@ __title__ = 'cpl_core.dependency_injection'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.0'
+__version__ = '2021.10.0.post1'
 
 from collections import namedtuple
 
@@ -28,4 +28,4 @@ from .service_provider import ServiceProvider
 from .service_provider_abc import ServiceProviderABC
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='0')
+version_info = VersionInfo(major='2021', minor='10', micro='0.post1')
diff --git a/src/cpl_core/environment/__init__.py b/src/cpl_core/environment/__init__.py
index 3f47418b..7ad5213f 100644
--- a/src/cpl_core/environment/__init__.py
+++ b/src/cpl_core/environment/__init__.py
@@ -15,7 +15,7 @@ __title__ = 'cpl_core.environment'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.0'
+__version__ = '2021.10.0.post1'
 
 from collections import namedtuple
 
@@ -25,4 +25,4 @@ from .environment_name_enum import EnvironmentNameEnum
 from .application_environment import ApplicationEnvironment
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='0')
+version_info = VersionInfo(major='2021', minor='10', micro='0.post1')
diff --git a/src/cpl_core/logging/__init__.py b/src/cpl_core/logging/__init__.py
index 77004711..699b65be 100644
--- a/src/cpl_core/logging/__init__.py
+++ b/src/cpl_core/logging/__init__.py
@@ -15,7 +15,7 @@ __title__ = 'cpl_core.logging'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.0'
+__version__ = '2021.10.0.post1'
 
 from collections import namedtuple
 
@@ -27,4 +27,4 @@ from .logging_settings import LoggingSettings
 from .logging_settings_name_enum import LoggingSettingsNameEnum
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='0')
+version_info = VersionInfo(major='2021', minor='10', micro='0.post1')
diff --git a/src/cpl_core/mailing/__init__.py b/src/cpl_core/mailing/__init__.py
index 1f0e7f7d..254418aa 100644
--- a/src/cpl_core/mailing/__init__.py
+++ b/src/cpl_core/mailing/__init__.py
@@ -15,7 +15,7 @@ __title__ = 'cpl_core.mailing'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.0'
+__version__ = '2021.10.0.post1'
 
 from collections import namedtuple
 
@@ -27,4 +27,4 @@ from .email_client_settings import EMailClientSettings
 from .email_client_settings_name_enum import EMailClientSettingsNameEnum
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='0')
+version_info = VersionInfo(major='2021', minor='10', micro='0.post1')
diff --git a/src/cpl_core/time/__init__.py b/src/cpl_core/time/__init__.py
index a16b20a3..17a7e074 100644
--- a/src/cpl_core/time/__init__.py
+++ b/src/cpl_core/time/__init__.py
@@ -15,7 +15,7 @@ __title__ = 'cpl_core.time'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.0'
+__version__ = '2021.10.0.post1'
 
 from collections import namedtuple
 
@@ -24,4 +24,4 @@ from .time_format_settings import TimeFormatSettings
 from .time_format_settings_names_enum import TimeFormatSettingsNamesEnum
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='0')
+version_info = VersionInfo(major='2021', minor='10', micro='0.post1')
diff --git a/src/cpl_core/utils/__init__.py b/src/cpl_core/utils/__init__.py
index 637f1897..fa6b1356 100644
--- a/src/cpl_core/utils/__init__.py
+++ b/src/cpl_core/utils/__init__.py
@@ -15,7 +15,7 @@ __title__ = 'cpl_core.utils'
 __author__ = 'Sven Heidemann'
 __license__ = 'MIT'
 __copyright__ = 'Copyright (c) 2020 - 2021 sh-edraft.de'
-__version__ = '2021.10.0'
+__version__ = '2021.10.0.post1'
 
 from collections import namedtuple
 
@@ -25,4 +25,4 @@ from .string import String
 from .pip import Pip
 
 VersionInfo = namedtuple('VersionInfo', 'major minor micro')
-version_info = VersionInfo(major='2021', minor='10', micro='0')
+version_info = VersionInfo(major='2021', minor='10', micro='0.post1')