CM fix for 3.2