Here is a small patch for this bug.  It works as far as I can tell
though it's possible that it introduces other problems or that there's
a better solution.