Fixed JENKINS-20981