added check for Number