Update for an Issue #352