fixed issue #38