Update for PR #21