CMP: bug fix