Patch for an Issue #1050