Formally resolves issue #38