Another fix to serialization?