Bugfix for command line command