Fixed grouping issue