xref fix