Fix to prevent creating duplicated tags