Last comment change before I issue a PR for FetcherRetest