CLI fix