I have exactly the same issue, do you have a solution in the meantime?