Try to fix the nil retrys problem