Fix for JENKINS-16541