Fixed duplicate item bug