Fixes #247