Fix duplication of items