Aggregators fixed... again