crashes fixed