Possible crash fix