#1 these seems to fix the issue.

I’m just not quite sure yet if it does. Need to do more testing.