Fixed to work with modern jenkins