Fix generator structure