Bugfix in command switch