alright, I think I've found a fix for this.
I need to do a couple more tests, but if nothing goes wrong, it should be in the next update!