Input fix in CLI