bug fix #222