iGen bug fix attempt