Fixing Tagging Issue