Fix class/struct semantic issue