Yes we have the very same problem.
The modifications will come shortly as a PR ! :-)