fix random problems