yet another generator fix