#94 fix generators support