fixed crash on rescue 2