Fix for [JENKINS-18510]