Commit a littl improvment for aggregation