Good news everyone! I think I have the fix!

I need to give it more time to sync, run some more tests, and clean up the code, but if all goes well it should be released tomorrow!

yay!