[Mpi-22] Ticket #33 review