bug fix #6.