Update for an Issue #963