Ouch, I was too quick -- apologies. The patch I attached to the previous message did not properly implement the fix I described. Here's another attempt.
Attachment: patch Description: Binary data