Fix to SP removal bug.