Fix for #806