I made some slight changes to that code, and I'd like to know if it helps or not. Update from the bazaar repository and test it out. I ran out of time to do it today, but I'll be running some test of my own tomorrow.