bug fix #87