Reverting my Group fix