Update for an Issue #431