Fixing to mirror current tagging practice