Fixed grouping
Merge pull request #417 from GrygrFlzr/master

Fixed grouping