Fix #247