Fix Cli