Correct fix for #808