Bugfix: support for MVAPICH2