Improve retry handling even more