Retry performance fix