Patch for an Issue #1010