Fix aggregation over time