Fix duplicate CM boxes