wang yami any chance you could provide a PR for that?

I'm certainly not able to fix it by myself.

Thanks!