Fixed: Check for duplicate tag