Thanks for reporting that. I see the problem even in the latest master, and 
installed the attached patch. Please give it a try. I'm boldly closing this bug 
report; if I'm wrong and this patch doesn't fix things we can reopen the bug report.