Fixed the issue with multi NS