Cli utility fixed