Did you solved this? I’m facing the same issue (and trying to fix it, but it is really hard and annoying )