Scoping in the generator removed