Stopped some of the crashing