Grouping setup is fixed now