change by xing240 to  repart 2 bug