fixed random stuff