Fixed Bug#9798 - Fields not saved under certain circumstances.