Have you ever found a solution to this? going through the same problem rn.