removed some crashes