 I am working on the issue and will create a pull request soon.