Made it into fork
CLI fix