Fixes #6295 - Prevents duplicate tags