tagging bug fix