Bugfix where command is not set