Comment 21 for bug 1031333

Created attachment 533817
For your review, I'd propose this patch to fix this.