fix groupid
Merge branch 'hotfix/groupid'