- Fixed #247