Aggregator bugfix