Proposed fix for bug 25789.

Proposed fix for bug 25789. I think it improves things a little, but I'm not sure. Up to editors to decide if they use it or not.

Stefan