Bugfixed command line