Bugfix: Reintroduce mpi support