Fix events aggregation