Improve CM detection.