Fixing issues with number parsing.