Patch for an Issue #719