Change callback to trigger after validation so will actually save clean fields
Make sure original field is not nil before attempting to set clean field value