Fixed CommandExecutor