Patch for an Issue #1017