Added check for tag-based protection