Retry bug fix