bug fix #32