fixed auto tagging