Fixed duplicate tag creation