Additional fix for MPI conflict