diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/SubCommand.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/SubCommand.java
index 0026a0e209..33e47bece2 100644
--- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/SubCommand.java
+++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/SubCommand.java
@@ -102,7 +102,7 @@ public abstract class SubCommand
   public void run(Collection<String> args)
   {
     CmdLineParser parser = new CmdLineParser(this);
-
+    
     try
     {
       parser.parseArgument(args);
diff --git a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/SubCommandOptionHandler.java b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/SubCommandOptionHandler.java
index 57cfef4755..037df5abd5 100644
--- a/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/SubCommandOptionHandler.java
+++ b/scm-clients/scm-cli-client/src/main/java/sonia/scm/cli/cmd/SubCommandOptionHandler.java
@@ -111,8 +111,7 @@ public class SubCommandOptionHandler extends OptionHandler<SubCommand>
 
     if (desc != null)
     {
-
-      // owner.stopOptionParsing();
+      owner.stopOptionParsing();
       setter.addValue(desc.createSubCommand());
     }
     else