Candidate patch for fixing the issue