bug fix #22