Added a patch to fix the problem.