fix tagging