Comment 15 for bug 436962

I investigated further and I hope I found a good patch for this.
Please test on many samples it might have a large side effects.
patch is committed in revision 10200.

theAdib.