Aggregator bug fix