fixed crashes in newest update