Improve retrying