For #802 Do not replace original values with errored edited fields