Better ignore
Fixed duplicate groups
Merge branch 'double_grouping'