MPC fix
MPC fix for pull request
Merge branch 'mpc_fix'