Fixed issue with cli