[FIXES] corrections on scrapping