Fixed bug related to hash building
Merge branch 'hotfix/group-hash-bug'