Handling of numbers improved