modified the fetcher to fix a limitation