Issue #22530:prevent multiple items
Merge pull request #269 from garyhgohoos/22530

Issue #22530:prevent multiple items