Fix again CLI