I believe this fixes #247