Patch for an Issue #1057