issue #38 fix