Fix for #851