Bootstrapped code corresponding to pull request #96