Fixed the random issue