Fix for crazy fail/retry problem.