Fixed functions for HPC