I recently encountered the same issue.
It would be really appreciated when you could update this with your solution