Update for an Issue #481