HUGE MP bug fixed