fix #41 and adapt to ScrapeType argument.