Fixed up generator