Comment 1 for bug 1098186

Oops... I've just noticed that the fix committed does not cover all the cases. I've just pushed a fix that will cover that too.