fixed compilation error plus more about the tweaking of generators