fix oneof loading