Update for an Issue #24