Fixed JENKINS-20747