Fixed: Crash on restart