Hopefully fixed MP crash...