This build should (as per double check for safety) fix all issues you and I found during the check.

Sorry again for the issues you've encountered, but even though I uploaded the exact same build I gave to Patreon members, it somehow crashed (even though there were none for the previous one)

Enjoy!