Fixed for latest HERMIT