Attempted crash fix