Issue #24746:avoid duplicates
Merge pull request #528 from garyhgohoos/24746

Issue #24746:avoid duplicates