Generator : Fixed type safety when passing some arguments