Improve retry behavior