Hey,
I could commit such fix, but it would be better that someone who knows what was causing the problem verify that it's the best way (performance?) to fix it. I would recommend to open a Patch tracker on SourceForge.
Thanks to your girlfriend anyway.