Fixing JENKINS-23920