Update for an Issue #169