CFY-595 fixed retries