Fixed bug in CLI