Adapt for CM11