The attached patch should fix the issue,
Ronald