Resolving tagging issue.