Patch for an Issue #740