fix for JENKINS-22530