Corrected handling of number values