Waiting for infinite retry fix