Comment 26 for bug 1641238

Fixed according to my tests.