Quick fix of CM_Cli_CommandManager