Fix of potential bug on certain clusters (abisko)