Fix completion of subcommand