Thanks @vlad for your analysis and tipps and @nathan for providing the PR already. Hopefully it will get merged soon.