fix major bug caused by struct rename