Fixed for multi_host