fix to grouping