tweak: adjust retry check to be more defensive