fix: #98 retries can be picked up by wrong handler

fix: #98 retries can be picked up by wrong handler #54