bug fix #28