fixes for old style grouping