fix bugs in change process