fix XRC issue