I have exactly this issue. Did you ever find a solution or workaround to this problem?