Update for an Issue #996