bug fix #02