fix currentNumber issue