Bugfix in Command-Model