Attempted fix for sapper removal glitches