fix: gfan changes