fix issue with dublicate items
code analysis