fixed crash on rescue