I believe this fixed #247