Okay, I spent a lot of time looking at it and I believe the bug is fixed. I still need to do more testing just to be sure, but it looks like it was fixed.
