G'day John,

Here is a patch I worked up for it.  Can you let me know if this works
for you also?  If so I'll get it committed.