Comment 9 for bug 960980

Should be fixed in trunk revision 11288.
Was hard to track for me and in the end it was very little code to fix it (in essence, a single if did the trick).