Patch for an Issue #716