Fixed a Stupid Bug
Merge branch 'command-bugfix'