Fix for number values when 0