Timo Kankare, would you be willing to create pull request with the fix?