Patch for an Issue #746