Scraping fix