Commit #247