Fixed the generator