bug fix #20