Fix for current CM