Fixing #247