- fixed generation issues