I am attaching a patch to resolve this issue. Please review.