Patch for an Issue #810