Add workaround for occasional failure when fetching images