fixed weighting issues