Quick'n'dirty fix for generator