[PATCHv3] better validation for numbers