Proper fix to xref