Fix sherpa