No more broken scrapers