The following fix (based on your nice explanation) seems to cure the problem without major rearrangements, but I didn't tested it well.
Have you fixed 1486 yet. Jose has Oked it so you can commit now, please remember to close the bug as well. It is amazing that you can always find better fixes for my patches. :-) You patch seems to work but I do not really understand what is going on. Could you explain a bit? Bo
