Fixing JENKINS-23533