Temporary fix for CM problems. Resolves #2649