change simple type values to undefined instead of null