Fixes Jenkins 20589