Patch for an Issue #978