Fix: random number issue