fixed random issues