Issue #247 work