Command line options bug fix