Christian Plätzinger, I've opened a PR with the changes I believe solve your issue. if you want, you're welcomed to build the PR with your code and see whether it works. The PR is based on master (5.4), so I'm not sure how that may impact compatibility with your existing code base.