Fixed bug with lost aggregations