Fixup! fixed concurrent issues at bulk retry logic