Overlay fix for CM