Great, I was trying to solve that since weeks, thinking it's in my code. So it's not me and I have a solution. It's very technical but it seems to work and I'll create a PR with the rest of my code.