Fixing the calling of subcommands.