Fix mismatched messages with CC