Fixed problem with duplicates of items