Comment 6 for bug 401483

I have a fix for this bug, look the related branch.