Fix to command line (again)