CMP bug fix