Also fix null_values during update