I found a bit of time to work on this and installed the attached patch, 
which should address the issue. Thanks for reporting it.