The 2 PRs#97 and #98