Fix how numbers are validated