fixed random issue