fix check current number issue