Fix a bug with parsing subcommands