bug fix #21