group fixes for regression