Fixed issue JENKINS-25452