Fixed issue #38