bug fix #38