Fix aggregator