bug fix #29