The likely fix of #247