fix for #JENKINS-25045