Aggregate weight calculation fix