Update for an Issue #672