Fix for MP events