partial fix of generators