Re #410 - Fixed tag deletion