Fix MPC pipeline (fixes #51)