Bugs in Command classes...