Patch for an Issue #713