Fix for duplicated tags