Thanks for the bug report. I suspect that fix won't work in general, 
though, and I installed the attached fix instead.