Yet Another Scavenge Bug Fix