fixed tagging issue