Fix bug with form-data values not being saved