Fixed aggregators again