fixed cli commands parser