Group list was always being added
Merge branch 'hotfix/1.0.4'