Fixed CLIClient