Trying to fix possible crash