bug fix #26