Latest fix from the pull request.