Fix saving of fields