Fixed. See comments in pull request.