Yet another fix of genereter