Update for PR #43