bug fix #13