FIXED: XREF problem