Fixed bug in CLIMessage