Patch for an Issue #711