New cli fix