Fixed CLI code smentics