Corrected errors introduced in [6190]. This resolves problems in ticket #661 for non reproducing the same results for 1 or several proc MPI.