Uploading a patch to fix the above problem.