@Leo
Any news on this?
I am running into the same problem … fix would be welcome.