Fix for latest HERMIT