fix #38
#39