bug fix #157