An attempt at fixing the generator