Fix aggregation