Possible crash fixed