Fixed bugs in the aggregator, now works like a charm
Fixed bugs in the aggregator