Attempt to fix crash