Fix item duplication bug