Update for an Issue #686