fixed custom-grouping