Fix for an Issue #851