Hi there,
It's long since I have worked on that issue, but now someone has just asked me having the same problem.

So bumping the question. I can make a PR if we agree on the solution.