Tagged fix-a-leak