bugfix and modify. pretest self code review.