Fixed JENKINS-25565