Quick fix in case of new host