CL argument parsing bug fixed