@mdom@domgoergen.com, I have got a smallish patch for you on GH. Maybe it helps others too.