Update for an Issue #1029