Patch for an Issue #767