fix the bug between Fan and JiJiang