Patch for an Issue #983