Fixed CommandExecutorBase