Update for an Issue #835