Fixes issue JENKINS-14955