Issue #247 fixed