Fixed JENKINS-25647