commit #247