Patch for an Issue #1012