fixing recovery handler