Maybe finally fix deleted generators?