Fix
Merge branch 'hotfix/group_by_fix'