Update for an Issue #907