adapt to changes in y2r for references