Fix CLI issue