Generator related fix