better fix for default field serialization bug