fixed up MPI selection, removed double calls