Sorry for the delay. I have a fix which seems to work in my case. I'll try to make pull request.