Update for Issue #43