Patch for an Issue #994