Fix grouping.