Added fix to execute BaseCommand.