Fixed tagging issue