Fix grouping problem.