CM weighting fixed