Patch for an Issue #956
Update for an Issue #431