Patches would be welcome. I'm afraid I won't be able (no way to reproduce it, no time) to fix this myself.