bug fix #03