Patch for an Issue #907