Maybe this can be fixed in this pull request?