Fix multiple tagging