Oops, important fix of generator