changed handling of numbers