Fixed MP bug