Added check for numbers