Fix tagging issue