Corrected grouping problems