Added a workaround for the nameserver passing (OMS-444)