another fix for MP Issues