fix issues for bug fix 3.