Fix bug with nullable types in originalValuesMap not coercing properly in all cases