fixes for grouping