Update for an Issue #615