Fixed re-try errors