World: Crash fix