Added support for numbers with spaces.