ImageFetcher: improved logic.