fixed crash on kamikaze