Commandline fix