Patch for an Issue #795