Updated for change in PR #26