Fix for #858