fixed CLI parser