fixed issue with Gen I types