Thanks for reporting the problem. Please try the attached patch, which I've installed in the development repository.