Ensure tags don't get broken