Comment 16 for bug 372164

The given patch fixes the bug. Works for me with revision 974.