Patch for an Issue #901