bug fix #138