Updated to match pull request.