Fix for tag removal