Fix handling of numbers.