This is also my only problem with this pull request.