Additional fix for multi manager