bugfix for scrapping