StavrosAyad there is no official way to solve the issue at this point. If we or someone comes up with a good fix, a PR will be created, reviewed then published with the next beta.
I know some people have worked around the issue with some manual changes in ways we can't support, so I can't give any advice on that.