Provided the patch for the issue. Please review.