Fix for Jenkins #16201