fix for mp mode
merge