Patch for an Issue #697