Patch for an Issue #731