Fixed duplication of items