Fix mp bug