[JENKINS-16941] A real fix for expanding