Duplicate tag bug-fix