changes in light of PR #830