Commandline args fix