I ran into exact the same problem and it was very hard to find a solution. Thank you so much for providing your solution here, it worked for me and saved me plenty of headache!
Best, Kai