Hi Roland, I just tried your commit on master branch, and it resolved the problem. Anyway, I think this issue can be closed now.