fix XRelation bug
Merge branch 'xa_master'