Fixing the generator