I’m dealing with the exact same problem. Did you find a solution?