Fix field serialization