Fixed broken CM support