Fix duplication of tags