I pushed the attached patch to fix this.  Thanks again for reporting the 
problem.