Patch for an Issue #1046