Fixed an issue with grouping
2.0.1