Fixed Issue #247