fixed JENKINS-20861