David Dole I've combined your patch with the approach described in my last comment. It would be great if you could test the pull request.