Fix in Group class