Fixed Bugs in CommandExecutor