fix bugs assign by qa & client