Fixed fix-up for omitted referenceIds