fix issue #38