Fixes #247

Fixes #246