I tried the simple fix together with Eriks patch, haven't been able to get it locked up yet after ~30 minutes. I'll also try the alternate simple fix later.