Cli class fix