fixed issue with duplicate items