Update for an Issue #757