Crash fix attempt