Fixed up name-server loop