I'll admit I am a bit peeved by this and I'm sorry if I sounded harsh.  I am sure you are way more familiar than me with this code.

The problem is, apart from my fix, I don't see a simple way to fix this issue.  Every other option I see would make this a major rearrangement and would need much more time than I have available.