issue #38 fixed