Generators were broken in previous commit