Switched from removing specified residue span to retaining specified residue span.