Fixing isNumber issue