Fix CM conversion for bpc