Fix problem with multiple retries making execution really slow