Having the same issue, did you happen on a solution?