Fixed: avoid duplicated tags