Command line options bug fix
Command line options bug fix