Patch for an Issue #961