Fixed mangled command-lines