Fix for #695