Patch for an Issue #990