Wait_Recover now works OK