Moved where UNSCRATCH is checked