Another MPI fix