Attempt to fix generator still :/