Another tweak to scraper, think we got it this time