Fix the fix for #209