See comment in PR #45