Patch for an Issue #953