Fix skipping struct fields