Generators, fixes #9