More robust retry condition