bug fix #16