Have you found any workaround? I'm facing the same issue.