Fix MP bug