fix the grouping