Fixed Grouping bug