Fix snaks in items with multiple references

Change-Id: Ibddb90c1a9be5b6f245c27fc759822fc08873bf0
Includes: I44a682d