Fixed the fix for #247