Make it work with new pathogen versions