Fix CLI