fix JENKINS-18858