Thanks for the bug report.  Does the attached patch fix the problem for you?