Fix jenkins bug 23232