Fixed bug with CLI failure