Seeing the same issue, would be great to get a solution here