NullableWrapper json conversion fix