Initial patch for an Issue #846
Potential fix for an Issue #846