Another tweak to scraper