On second thought I think I see the problem. I installed the attached patch into 
master; please give it a try.