Fixed issue #247