*fix the random issue