bug fix #139