Fix problem with resetting aggregates