Fix recovery handling