fix aggregation