broken group-for structure fix