Improve CC diagnostic