possible crash fix