Fixed #247