trying to fix MPI bugs