Fix for #805