Fix the generator, close #11