Fixing #247 the correct way, this time