Fix issue #38