Hopefully fixed random crashing