fixing vars for multi master