Fixing selective retry bug