Better Number detection