Fixing parsing of structs