PR15868 fix.