Fix for rescue