Fix for JENKINS-26160

This pull request should fix JENKINS-26160